From bbd1532f84da5ab9b1e76b004fce13722c4cb673 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Mon, 21 Jan 2019 00:47:30 +0100 Subject: [PATCH] imcontext: Fix priorities of modules All built-in backend modules get a priority of 0 because they are the default ones. GtkIMContextSimple gets a priority of G_MININT because it's the fallback one. This mirrors the media modules code. --- gtk/gtkimcontextbroadway.c | 2 +- gtk/gtkimcontextime.c | 2 +- gtk/gtkimcontextquartz.c | 2 +- gtk/gtkimcontextsimple.c | 2 +- gtk/gtkimcontextwayland.c | 2 +- gtk/gtkimcontextxim.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gtk/gtkimcontextbroadway.c b/gtk/gtkimcontextbroadway.c index 5ad2010125..8006081d60 100644 --- a/gtk/gtkimcontextbroadway.c +++ b/gtk/gtkimcontextbroadway.c @@ -47,7 +47,7 @@ G_DEFINE_TYPE_WITH_CODE (GtkIMContextBroadway, gtk_im_context_broadway, GTK_TYPE g_io_extension_point_implement (GTK_IM_MODULE_EXTENSION_POINT_NAME, g_define_type_id, "broadway", - 10)) + 0)) static void broadway_set_client_widget (GtkIMContext *context, GtkWidget *widget) diff --git a/gtk/gtkimcontextime.c b/gtk/gtkimcontextime.c index 2d776b4560..768e123fbe 100644 --- a/gtk/gtkimcontextime.c +++ b/gtk/gtkimcontextime.c @@ -130,7 +130,7 @@ G_DEFINE_TYPE_WITH_CODE (GtkIMContextIME, gtk_im_context_ime, GTK_TYPE_IM_CONTEX g_io_extension_point_implement (GTK_IM_MODULE_EXTENSION_POINT_NAME, g_define_type_id, "ime", - 10)) + 0)) static void gtk_im_context_ime_class_init (GtkIMContextIMEClass *class) diff --git a/gtk/gtkimcontextquartz.c b/gtk/gtkimcontextquartz.c index d35a8e3998..7b046c3def 100644 --- a/gtk/gtkimcontextquartz.c +++ b/gtk/gtkimcontextquartz.c @@ -55,7 +55,7 @@ G_DEFINE_TYPE_WITH_CODE (GtkIMContextQuartz, gtk_im_context_quartz, GTK_TYPE_IM_ g_io_extension_point_implement (GTK_IM_MODULE_EXTENSION_POINT_NAME, g_define_type_id, "quartz", - 10)) + 0)) static void quartz_get_preedit_string (GtkIMContext *context, diff --git a/gtk/gtkimcontextsimple.c b/gtk/gtkimcontextsimple.c index f1436bd62b..1c738bf103 100644 --- a/gtk/gtkimcontextsimple.c +++ b/gtk/gtkimcontextsimple.c @@ -129,7 +129,7 @@ G_DEFINE_TYPE_WITH_CODE (GtkIMContextSimple, gtk_im_context_simple, GTK_TYPE_IM_ g_io_extension_point_implement (GTK_IM_MODULE_EXTENSION_POINT_NAME, g_define_type_id, "gtk-im-context-simple", - 10)) + G_MININT)) static void gtk_im_context_simple_class_init (GtkIMContextSimpleClass *class) diff --git a/gtk/gtkimcontextwayland.c b/gtk/gtkimcontextwayland.c index 66ea4c86c9..e621f13b70 100644 --- a/gtk/gtkimcontextwayland.c +++ b/gtk/gtkimcontextwayland.c @@ -98,7 +98,7 @@ G_DEFINE_TYPE_WITH_CODE (GtkIMContextWayland, gtk_im_context_wayland, GTK_TYPE_I g_io_extension_point_implement (GTK_IM_MODULE_EXTENSION_POINT_NAME, g_define_type_id, "wayland", - 10)); + 0)); static GtkIMContextWaylandGlobal *global = NULL; diff --git a/gtk/gtkimcontextxim.c b/gtk/gtkimcontextxim.c index 01629ab054..58f82d25e2 100644 --- a/gtk/gtkimcontextxim.c +++ b/gtk/gtkimcontextxim.c @@ -149,7 +149,7 @@ G_DEFINE_TYPE_WITH_CODE (GtkIMContextXIM, gtk_im_context_xim, GTK_TYPE_IM_CONTEX g_io_extension_point_implement (GTK_IM_MODULE_EXTENSION_POINT_NAME, g_define_type_id, "xim", - 10)) + 0)) static GSList *open_ims = NULL; -- 2.30.2